From 8b9b9c22e710661b56de4dcf68b5c4fd6ca980a8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sat, 13 Nov 2010 01:24:07 +0100 Subject: [PATCH] GtkCssProvider: Also parse GdkColor values This is necessary for widget style properties to work. --- gtk/gtkcssprovider.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 20803a2774..d41df05de8 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -2313,12 +2313,18 @@ css_provider_parse_value (GtkCssProvider *css_provider, type = G_VALUE_TYPE (value); - if (type == GDK_TYPE_RGBA) + if (type == GDK_TYPE_RGBA || + type == GDK_TYPE_COLOR) { GdkRGBA color; + GdkColor rgb; - if (gdk_rgba_parse (&color, value_str) == TRUE) + if (type == GDK_TYPE_RGBA && + gdk_rgba_parse (&color, value_str)) g_value_set_boxed (value, &color); + else if (type == GDK_TYPE_COLOR && + gdk_color_parse (value_str, &rgb)) + g_value_set_boxed (value, &rgb); else { GtkSymbolicColor *symbolic_color; -- 2.30.2